tools/toolbox: Use devkit when integrating with GNOME Builder

Also support the new devkit when running from Builder. Unlike for
the run-gnome-shell script, we cannot easily support both --devkit
and --nested (without adding some wrapper), so drop the latter.

It should be fairly uncommon to use Builder to develop against
older branches, so hopefully this shouldn't be a limitation in
practice.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3731>

diff --git a/tools/toolbox/create-toolbox.sh b/tools/toolbox/create-toolbox.sh
index c5bad35050e9547123d499dd83a91943a0b12247..bb3b862241c1b315688564daf31dfb84bc73bdf2 100755 (executable)
--- a/tools/toolbox/create-toolbox.sh
+++ b/tools/toolbox/create-toolbox.sh
@@ -53,7 +53,6 @@ install_extra_packages() {
 create_builder_config() {
   local container_id=$(podman container inspect --format='{{.Id}}' $NAME)
   local top_srcdir=$(realpath $(dirname $0)/../..)
-  local wayland_display=builder-wayland-0
 
   cat >> $top_srcdir/.buildconfig <<-EOF
 
@@ -61,10 +60,9 @@ create_builder_config() {
        name=$NAME Toolbox
        runtime=podman:$container_id
        prefix=/usr
-       run-command=dbus-run-session gnome-shell --nested --wayland-display=$wayland_display
+       run-command=dbus-run-session gnome-shell --devkit
 
        [toolbox-$NAME.runtime_environment]
-       WAYLAND_DISPLAY=$wayland_display
        G_MESSAGES_DEBUG=GNOME Shell
        XDG_DATA_DIRS=${XDG_DATA_DIRS:-/usr/local/share:/usr/share}
        EOF